bitkeeper revision 1.1159.246.2 (4204c18cvI5Uk50dXB8wqfQwKj9ZGw)
authorkaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk>
Sat, 5 Feb 2005 12:52:28 +0000 (12:52 +0000)
committerkaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk>
Sat, 5 Feb 2005 12:52:28 +0000 (12:52 +0000)
commit4fe70c2f8c4c43527fd66fc852bdff6eaaeb33c6
tree9668a4dfd75ffa1f828ff38ef20c0e18b17b566d
parentda6601fe81ad6abba4ad58780c95814b73f8be00
bitkeeper revision 1.1159.246.2 (4204c18cvI5Uk50dXB8wqfQwKj9ZGw)

Manual merge.
Signed-off-by: keir.fraser@Cl.cam.ac.uk
xen/arch/x86/traps.c
xen/common/schedule.c